Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade from Chromium 73.0.3683.75 to Chromium 74.0.3729.40 #2152

Merged
merged 3 commits into from
Apr 5, 2019
Merged

Upgrade from Chromium 73.0.3683.75 to Chromium 74.0.3729.40 #2152

merged 3 commits into from
Apr 5, 2019

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Apr 2, 2019 •
edited
Loading

@mkarolin mkarolin added this to the 0.63.x - Beta milestone Apr 2, 2019
@mkarolin mkarolin self-assigned this Apr 2, 2019
@mkarolin mkarolin mentioned this pull request Apr 2, 2019
Merged
@mkarolin mkarolin force-pushed the 74.0.3729.40-0.63.x branch 3 times, most recently from 26bde39 to a2534cc Compare April 4, 2019 13:50
bsclifton and others added 3 commits April 4, 2019 17:49
@bsclifton @mkarolin
Merge pull request #2117 from brave/74.0.3729.40
15ebcbe 
Upgrade from Chromium 73.0.3683.75 to Chromium 74.0.3729.40
@mkarolin
Added missing dependency.
147313e 
chrome/app/BUILD.gn's target generated_resources generates
grit/generated_resources.h which we overwrite via chromium_src
and include brave/grit/brave_generated_resources.h. We need
to make sure that that header exists, so generated_resources
target needs to depend on //brave/app:brave_generated_resources_grit.
@mkarolin
Updated patches for 0.63.x branch.
7de5100
@mkarolin
Copy link
Collaborator Author

mkarolin commented Apr 5, 2019 •
edited
Loading

CI passed (except for lint):
https://staging.ci.brave.com/job/brave-browser-build-pr/job/PR-3976/14/
https://staging.ci.brave.com/job/brave-core-build-pr/job/PR-2152/10/

@mkarolin mkarolin requested a review from a team April 5, 2019 00:40
@mkarolin mkarolin marked this pull request as ready for review April 5, 2019 00:40
@kjozwiak
Copy link
Member

kjozwiak commented Apr 5, 2019

@mkarolin before approving the following PR into 0.63.x, we'll need to make sure 0.64.x is building fine with CR74 included. Once we confirm things are looking good on dev, we'll approve the following PR and get CR74 into 0.63.x 👍 CCing @bsclifton.

bsclifton
bsclifton approved these changes Apr 5, 2019
View reviewed changes
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

@bsclifton bsclifton merged commit a7115e1 into 0.63.x Apr 5, 2019
@bsclifton bsclifton deleted the 74.0.3729.40-0.63.x branch April 5, 2019 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsclifton bsclifton bsclifton approved these changes

Assignees

@mkarolin mkarolin

Labels
None yet
Projects
None yet
Milestone
0.63.x - Release
Development

Successfully merging this pull request may close these issues.
3 participants
@mkarolin @kjozwiak @bsclifton